Merge branch 'master' into 'matthiasc/for-master'
authorMatthias Clasen <mclasen@redhat.com>
Fri, 4 Jun 2021 20:24:09 +0000 (20:24 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 4 Jun 2021 20:24:09 +0000 (20:24 +0000)
commitff874318c0df3f0ba1f33828e74ad22ac2aefd53
treef59809395574201d3d52c64901d49e73f14829e9
parenta4598567b9dd231b3bfd885bc59fdf453afe7433
parentff01067b8be0fb58264da681611d4e2f72d1ed38
Merge branch 'master' into 'matthiasc/for-master'

# Conflicts:
#   docs/reference/gtk/migrating-3to4.md